whitespace fix
test some complex values too, shorten test code