Added service credits, some real tests now