PLUGIN+API: Improved testing.