Introduced package structure for tests