tesing code and fixes for package branch