Update tests and rqmts