Update unit tests, sanitize variable prices

Add unit test for issue #2316