fixed waves.json, added 12-wave support to wavefactory and adjusted tests