Changed packages and added test cases and more: