Add test on entities