Add reviews to test, minor fixes