Organizing code for Testing