Concatenate unit tests and small fix.