Clean up

Cleaned up test failures and deprecated tests