overhauled some tests, fixed order, added migration
coverage
merge conflicts