tests moved
tests finally working