Fixed faulty tests, added even more