Fixed build and testing