unit tests tested and updated