Removing USE_TESTS stuff ('twas stupid)