Also add improved tests