Fixed some errors preventing testing.