few more updates to tests