Further additions to test suite for advanced testing