Fixed value collection

* Added some tests
* Fixed field detection to actually get data
* Turns out that is pretty important.