Finished all but one test, added suggestion