Fixed tests. Basing tests on the entity models now.