diff --git a/.gitignore b/.gitignore
index 269cd9ba..9fd1b45c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@ src/vzlogger
 
 # directorys from install.sh
 libs/
-build/
+build*/
 
 # Compiled Object files
 *.slo
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3fbc5016..db9fab2d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -37,7 +37,7 @@ endif( OMS_SUPPORT )
 
 add_executable(vzlogger_unit_tests ${test_sources} ../src/CurlSessionProvider.cpp ../src/protocols/MeterW1therm.cpp ${oms_sources} ${MQTT_SOURCES})
 
-add_dependencies(vzlogger_unit_tests googletest googlemock)
+add_dependencies(vzlogger_unit_tests googlemock)
 
 target_link_libraries(vzlogger_unit_tests
     ${GTEST_LIBS_DIR}/libgtest.a
diff --git a/tests/mocks/CMakeLists.txt b/tests/mocks/CMakeLists.txt
index 70c2cf4b..41f08728 100644
--- a/tests/mocks/CMakeLists.txt
+++ b/tests/mocks/CMakeLists.txt
@@ -55,7 +55,7 @@ add_executable(mock_metermap mock_metermap.cpp ../../src/Meter.cpp ../../src/Opt
 	${mock_mqtt_sources}
 )
 
-add_dependencies(mock_metermap googletest googlemock)
+add_dependencies(mock_metermap googlemock)
 
 target_link_libraries(mock_metermap ${CURL_STATIC_LIBRARIES} ${CURL_LIBRARIES})
 
@@ -92,7 +92,7 @@ add_executable(mock_MeterW1therm
     ../../src/Options.cpp
 )
 
-add_dependencies(mock_MeterW1therm googletest googlemock)
+add_dependencies(mock_MeterW1therm googlemock)
 
 target_link_libraries(mock_MeterW1therm
 		${GTEST_LIBS_DIR}/libgtest.a
@@ -115,7 +115,7 @@ add_executable(mock_MeterOMS
 	../../src/Options.cpp
 )
 
-add_dependencies(mock_MeterOMS googletest googlemock)
+add_dependencies(mock_MeterOMS googlemock)
 
 target_link_libraries(mock_MeterOMS
 		${GTEST_LIBS_DIR}/libgtest.a
@@ -139,7 +139,7 @@ add_executable(mock_MeterS0
 	../../src/Options.cpp
 )
 
-add_dependencies(mock_MeterS0 googletest googlemock)
+add_dependencies(mock_MeterS0 googlemock)
 
 target_link_libraries(mock_MeterS0
 		${GTEST_LIBS_DIR}/libgtest.a
diff --git a/tests/mocks/mock_metermap.cpp b/tests/mocks/mock_metermap.cpp
index 6dc0f642..c916096c 100644
--- a/tests/mocks/mock_metermap.cpp
+++ b/tests/mocks/mock_metermap.cpp
@@ -67,7 +67,7 @@ TEST(mock_metermap, basic_open_close_not_enabled) {
 	EXPECT_FALSE(m.running());
 }
 
-TEST(mock_metermap, one_channel) {
+TEST(mock_metermap, DISABLED_one_channel) { // todo issue #400
 	std::list<Option> o;
 	o.push_back(Option("protocol", "random"));
 	mock_meter *mtr = new mock_meter(o);
@@ -111,7 +111,7 @@ size_t return_read(std::vector<Reading> &rds, size_t n) {
 	return 1;
 }
 
-TEST(mock_metermap, reading_in_proper_channel) {
+TEST(mock_metermap, DISABLED_reading_in_proper_channel) { // todo issue #400
 	std::list<Option> o;
 	o.push_back((Option("protocol", "random")));
 	mock_meter *mtr = new mock_meter(o);