Added strategy and more test cases