new tests added and structure changed