[FIX/TEST] Updated tests