Pass more complaince tests