Building out test suite and funcitons