Restored tests to green