MASTER: Added few unit tests and form validation