Added tests to build