updated tests that needed corrections and added new tests