Took code out of default package into dev package, and added tests