Reimplemented commented out tests.