Tests for eager_loading and improvements to timestamp comparison field