Add tests to formBuilder
Bug fix: Use correct variable