Improved data set (more null checks)
Added tests for form submit