Add select option and fix tests