Added Tests

Added more tests.