Add Tests: Continue

Got rid of columns on form (too buggy)