Modified more tests

Added/Modified more tests