fixed broken tests / fixed typos created in refactor