updated to the latest structure, I didn't even need to change the test'