Fixed to adhere to style guidelines. Also changed master to use in_memory registry for testing.