Broke tests out into their own classes/folder.