Fixed some testing stuff and now the tests pass ^____^
Merged changes.