unit tests cleanup
sort + unit tests (TODO: fix indentation)
field names fixes + unit tests