all test green
refactor tests