Fixed build and test tasks