#28 #11 Fixed remaining issues with tests for render delegation