Fixed broken build and the test