Remove plural from test folder name