Better bug fix for part 2; added controller spec regression tests