Add more service tests for base