Sam - Added more unit tests

Testing combination of scenarios