Add times_awoke; fixed tests