Added shallow history tests; fixed history bug