added future, match and option tests