Fixed tests to compile properly