Entity tests added. Minor form fixes.