Removed unnecessary check. Merged tests into 1.