Make all tests pass and repair little refactoring error
Merge branch 'Ticket0466'