Add test unit back in