Fixed some tests and forms