Checkbox cleanup and better price testdata