fixed even more fucking bugs in tests