more careful loading and more tests