* refactor tests and analysis passes * identity test working * combine test categories with only a few cases * more fixes