Resolve compilation and test errors