WIP adding myquery tests and functionality