struct and tests updated, main tests work