Adding polymorphic tests and some comments