Added tests around loading count, just need to migrate code to look up related entities