Tests separated and cleanups done and cleanups done