remove save changes
cleanup
fix some multithreaded test issues and change to unit of work pattern