Working on them tests. woohoo