In the process of moving to object notation for all test targets
work in progress
fixed merge issues