Changed how tests run
bug fixes
Removed unused logging prints