Keep TestEmpty from panicking

Here ya go. Working on a few more, will pile on here until you merge.