Fixed error, now all tests are passing. TODO: Insert tests from other (old) file, to this AutoTest
Added all my tests, all are passing.