Reworking old tests