Added tests for additional types