fixes after test 1