Added test case for complete form
Optimized imports and fixed some code violations (had to parameterize raw types)