Fixing up some test logic and continuing strings integration