tried cleaning up tests, but I don't have it in me right now