fixes tests and moves files