Use conventional class syntax

Signed-off-by: Abhijit Hiremagalur <abhi@pivotallabs.com>
Spec was subtly reliant on test-pollution

Signed-off-by: Abhijit Hiremagalur <abhi@pivotallabs.com>
Avoid accidentally relying on test pollution

Signed-off-by: Abhijit Hiremagalur <abhi@pivotallabs.com>