cleaning up and preparing

tests