added test-only mode