Adding tests for entities