- Separate test code and library
- Add stub function for rest of service API