Added unit tests for new form
LOL