Refactored tests - moved private helper methods to the end of file