adding new tests with new shape functions and better support for new tests