battery test; improved existing tests