Added 40 more tests, made formfactor regex case sensitive & pass new tests