refactored get for all scenarios
added test cases
cleanup