updated some logic and added new test data