Start testing some state invariants
Clean-ups + be sure that we are testing meaningful things