Added print option usage throughout and more tests