starting to fix and move test to correct pos