Move test files for plugin into test folder
Fix async tests