20 more tests, update formFactor.js to pass new tests