- Fixed out of place comment, tweaked tests