Worked on api and test code