Added verbose command line option; updated tests