Added build and test, unit test