Expand unit tests