Refactored tests to store data in dictionaries

I've refactored the tests to keep their data stored in dictionaries, instead of in a class.