Start to add in tests, fix testsettings