Adding forgotten tests