Temporary fixes to test get with entity bundle