updated tests, fixtures