Minor fixes, default testing options