updated basic objects, unit tests added
removed old module