Predefined field test, and some fixes