Add Tests: Continue

little code clean up