Migrated math tests
More fixes
More fixes, nearly everything compiles now