Test cleanup
Basic validation. Added service codes.
Test for service specific validations