removing exceptions
fix class function test