updated files and tests
Merge branch 'manny'