Expose new functionality as select_all, return token in select
Clean up tests to be less verbose