corrected failures on mockups for all use cases