Adding command line options and finishing test