Added more tests to cover more things.