Some more tests working