melody eval code fixed, test code adjusted