Fixed compile errors. Onto tests.