fixed up existing tests