Fix #1502 - Remove duplicate unit tests