Added ShortFormController and associated Unit Tests