fixed issues caused by refactor / cleaned up tests