Knocking out some failing tests