Redid some lost work due to strange commit. Adding in setup for dictionary tests