Fixed issue #16 regarding optional test numbers