Simplifying API 0.2 tests