Fixed some tests

@edegraff, the Controller tests seem a bit mucked up. null pointers with saving
stories and such. Please take a look.