Fixed broken tests. Disabled entity tests for now.

Review URL: https://codereview.appspot.com/180210043