fix number of tests
add collection interface
clean up whitespace