Move to single file. Switch to py.test