Cleaned DAO unit test
Restructured form system