expand methods
adjust tests
tests passing for expanding queries