more tests working