test fixings
Merge pull request #85 from orta/more_state

@ashfurrow => test fixings