Fixed some tests. More to go