#130 - Clean up spec_helper. Move to multiple files.