Add more test cases and get them to work with domino