Small fix for renamed field.
Moves test classes to tests.py