remove whitespace
changes test names and adds the right notation
resolves conflict