Fix and even more tests