9 Commits (CON-2233-TESTS-create-wave-test)