Fixed specs; added specs for the new controller