Made tests configurable; added more tests; cmd line options to run faster