Step #6 Catch up automation with included tests