Added empty struct tests back in