made the unit tests more dynamic