Adding test cases for #35