Add additional tests for 34