Finishing preliminary tests for ContextBuilder