More unit tests mucking with structure