Add more tests, fix form tests