Update battery tests, add case for #66, fix #66