added unit tests
added unit tests
moved submit button to new line
Merge branch 'dev'