This change fixes a bug where a test that required a sample was being included in the suite when SAMPLES was not set. It also improves the consistency of variable names relating to the API tests. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>