Fixed merge mistakes. Specs pointed to wrong file.