Fixed some bugz. Significantly decreased the size of the returned data.
Added harsher tests.