First pass on fixing tests