Use more descriptive names for Makefile settings.
Fixed test file selection based on 'test_' prefix.