Updates to update all packages and also to reorg a bit and set up tests to execute properly