Fixed some testing stuff and now the tests pass ^____^