modularizing and continuing to write tests