fixed negotiator test

- moved negotiator tests into separate file