formatting
add domain to a few obvious test cases
reorder arguments and make domain required