Fixed warning messages, improved tester