minor
minor improvements in structure of test code
formatting