Fixes for testing through ch3 tutorial