Fixing up structure for tests