Fixed the stuff for testing.