empty tests removed
new structure