Test fixing, tests #34 & #35 implementation