unit tests tested and updated...more!