moved valuenames to a single location
added test for empty list