Adding packages and test files