passed more tests - seems to work