Fixed bugs, added test settings