fix end observation, move tests files