More tests/asserts with a good organizations