Refactored way option is passed to createSingleFormula()
Removed assertions for tests which are no longer needed due to the changed handling of package formulae.