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

Accept.... OR ELSE!@