Done with refactoring all conditionals to check assertions. All tests are
atomic and completely independent