More commonolity in unit tests