Fixed tests to compile