Test private methods, Refactor