Adding tests to `Form` for extra classes

Added tests that were missing and ones for my new logic