Updated service and tests. Added bootstrap