Feature/tuesday test fixes