-- updated and rewrote some test methods

-- added more test cases for some methods