Starting to make unit tests more generic