dryed up some tests
moved inmemory to another folder for readability