Add tests for after