Make comments postive
Add #assert_equal items
Streamline