Refactor tests, add concept fixtures.