Added couplet and couplet_tests, updated haiku_tests
fixed conflict in haiku_tests.py