Updated framework, packages, and added tests