added more struct tests