working on new system test
Major system test..