Add several test and reorganize test folder