Splitting the unittests into separate files. Also fixing the bracket ordering for asking != queries