Fixed some tests, some remain