Test refactoring - turn green few tests