adding additional unit test
removing unneeded branching