tests cleaned up
static data handling fixed