gc - getting closer to having the tests work again