Changed naming and output formatting for test