got rid of dumb test, fixed the others