Updated upcoming method and added tests for it.