correct tests and move stuff around