Fixed tests and updated FormInterface