Fixed build and test