added command line options + removed test classes