Restructure tests

Refs #184

Depends on #198

Move around the tests to organize them better.