Dedupe code fully functional, add some more to the test list