have all tests in main test suite working, started working on manual tests