refactored unit test suite
refactored form classes
little refactoring