Added the (critical) tests :rage4: