Little stuffs

All tests pass if you run them individually.