re-complete commented function
adjust whitespace and test count