Finished unifiying naming mess in test/fixtures/code