Adding tests for new Service framework and clearing out tests for old Reader style