Updated some changes and added test example