Removed unused/duplicated code. Removed most options from tester.