added Evangielis’s #337 and Shriram’s #345 tests