Added structure for tests