Refactor - Reduce the amount of useless tests.