Migrated tests to new infrastructure

To test more accuratly for timeing