py.test compatibility changes.

Renamed files and tests to be compatible with py.test's auto-discovery.