DRY in unit tests - Also added new test cases