Further cleaned up tests and set all to failing