Fixed tests to work with new format, cleanup setup