Cleaned up tests and moved stuff around

Moved information into pots. Needed a structural change.