fixed errors in my tests that were created during a merge
The tests that fail in the master branch (version that this was branched off) are now the same that failed in my own branch.
The tests that fail in the master branch (version that this was branched off) are now the same that failed in my own branch.