Made changes to package.scala and to fix FunctionalSpecs2