Refactor test names so maven can pick then up.