clean up silly comments
add one test case that currently fails
for methods only used by tests switch to alternatives that are actually in use by other code