Added additional packages and a test directory