formatting: remove unnecessary line breaks; remove redundant argument
more formatting cleanups
add test
two more tests