Simplified/removed some test cases that are covered by automated tests