Restructured the testing and started with building the gdlcontext properly