Renamed test file, added mocks, more test cases.