Add named arguments, export test utils to a separate module