remove serial number from tests
Merge branch 'issue-196' into develop