removed pluralization from the unit test folder names