Migrated in-file tests to a test suite, and deleted the old set from the file. There's a couple tests that are failing, need to examine those.