Working on the fall through unit-tests