Cleaned up some errors, removed test file