addressing comments from brock
fixing unit tests, updating test results