Fix some broken spec expectations and move/rename a method