Add test and make sure the origin returned is always the one sent, after validation, refs #9