Substitute tests

With test!