Tests migrated
test refactor completed