Added color for debugging, better matching, and more unit tests