removed unused code
added more tests and commented out tests that made test process crash... still TBD