Added tests for forms, improved commandor event flow