Merged in unit tests