improved test classes added REST support