Break out unit service tests