Fix schema which had shifted due to branch hopping.
Remove unncessary spec_helper requires.
Make surname search case insensitive.