added test class
changed value names