Fixed some find & write tests to handle embedded entities