got rid of all the tests an effectively
went back to b22574c4744a