Added base unit tests