joachimmetz Applied updates and changes for tests