Meh... sorta getting more tests to pass