merge in start of new tests stuffs blur-374