More bugfixes, tests are now working