fixes during test