Updated main test