added test scenarios in test directory
minor adjustments