Adds benchmark option; Adds more tests;