Updateds some more tests
commented out test in progress