tests fields boxes models
pep8
merge