Renamed test files to match the conventional pattern used, allowing these tests to run from 'ant test'