diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a2f66c1a7..d2cdffb905 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,7 @@ if (COVERALLS)
 	add_custom_target(coverage
 		COMMAND lcov --capture --directory . --output-file coverage.info
 		COMMAND genhtml coverage.info --output-directory out
-		COMMAND firefox out/index.html
+		COMMAND x-www-browser out/index.html
 		WORKING_DIRECTORY ${CMAKE_BUILD_DIR}
 		DEPENDS coveralls
 		)
diff --git a/matrix/matrix.hpp b/matrix/matrix.hpp
index 7e17375eae..0b49dc895c 100644
--- a/matrix/matrix.hpp
+++ b/matrix/matrix.hpp
@@ -7,3 +7,5 @@
 #include "Euler.hpp"
 #include "Dcm.hpp"
 #include "Scalar.hpp"
+
+#include "filter.hpp"
diff --git a/test/filter.cpp b/test/filter.cpp
index b2fa0f8b27..b4103d566c 100644
--- a/test/filter.cpp
+++ b/test/filter.cpp
@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include "filter.hpp"
+#include "matrix.hpp"
 
 using namespace matrix;
 
diff --git a/test/inverse.cpp b/test/inverse.cpp
index 21a2309659..1bd92ae47c 100644
--- a/test/inverse.cpp
+++ b/test/inverse.cpp
@@ -1,7 +1,8 @@
-#include "SquareMatrix.hpp"
 #include <assert.h>
 #include <stdio.h>
 
+#include "matrix.hpp"
+
 using namespace matrix;
 
 static const size_t n_large = 50;
diff --git a/test/matrixAssignment.cpp b/test/matrixAssignment.cpp
index 44e0e3a055..e9f5d3152c 100644
--- a/test/matrixAssignment.cpp
+++ b/test/matrixAssignment.cpp
@@ -1,6 +1,7 @@
-#include "Matrix.hpp"
 #include <assert.h>
 
+#include "matrix.hpp"
+
 using namespace matrix;
 
 template class Matrix<float, 3, 3>;
diff --git a/test/matrixMult.cpp b/test/matrixMult.cpp
index 0af96180c6..6ac0670065 100644
--- a/test/matrixMult.cpp
+++ b/test/matrixMult.cpp
@@ -1,7 +1,8 @@
-#include "Matrix.hpp"
 #include <assert.h>
 #include <stdio.h>
 
+#include "matrix.hpp"
+
 using namespace matrix;
 
 int main()
diff --git a/test/matrixScalarMult.cpp b/test/matrixScalarMult.cpp
index c0b8932604..be093d03fb 100644
--- a/test/matrixScalarMult.cpp
+++ b/test/matrixScalarMult.cpp
@@ -1,7 +1,8 @@
-#include "Matrix.hpp"
 #include <assert.h>
 #include <stdio.h>
 
+#include "matrix.hpp"
+
 using namespace matrix;
 
 int main()
diff --git a/test/setIdentity.cpp b/test/setIdentity.cpp
index 75e1c8e69a..c4e8830603 100644
--- a/test/setIdentity.cpp
+++ b/test/setIdentity.cpp
@@ -1,6 +1,7 @@
-#include "Matrix.hpp"
 #include <assert.h>
 
+#include "matrix.hpp"
+
 using namespace matrix;
 
 template class Matrix<float, 3, 3>;
diff --git a/test/vector.cpp b/test/vector.cpp
index c7ee34ec75..5c63140311 100644
--- a/test/vector.cpp
+++ b/test/vector.cpp
@@ -1,7 +1,8 @@
-#include "Vector.hpp"
 #include <assert.h>
 #include <stdio.h>
 
+#include "matrix.hpp"
+
 using namespace matrix;
 
 template class Vector<float, 5>;
diff --git a/test/vector3.cpp b/test/vector3.cpp
index 1535efd549..a7a033bf38 100644
--- a/test/vector3.cpp
+++ b/test/vector3.cpp
@@ -1,7 +1,8 @@
-#include "Vector3.hpp"
 #include <assert.h>
 #include <stdio.h>
 
+#include "matrix.hpp"
+
 using namespace matrix;
 
 template class Vector<float, 3>;
diff --git a/test/vectorAssignment.cpp b/test/vectorAssignment.cpp
index 258616f338..86b3571f8e 100644
--- a/test/vectorAssignment.cpp
+++ b/test/vectorAssignment.cpp
@@ -1,6 +1,7 @@
-#include "Vector3.hpp"
 #include <assert.h>
 
+#include "matrix.hpp"
+
 using namespace matrix;
 
 template class Vector<float, 3>;