Final additions/updates to tests