Add tests for the last pull request

Next time please take care to do this yourself