cleaned up some tests
added form test