bug fixes, test refactoring, test green