fixed test, clarified a single comment
better tests, comments