updated core
moved test files around to make [i1] tests more meaningful