US632 - fixed broken tests
US632 - applied changes after business review