Fixing up tests to have a better structure.