Re-estructuring unit tests