uncomment full test suite; remove unused code
cleaned out comments. finalized for pull req