more tests working
fixed all tests