[RC/Simon] Fixed/add more tests.