minor reviews
minor changes for testing scenarios