More concise tests
Move python files back to project root