Clean up duplicates & update for 1.5.1 test