removed old entities; edited test