Added tests. Entities no longet have id's.