Remove duplicate class
Add simple smoke test for production API