Added more tests for System