Fixed tests. More to come