Remove old tests, add requires