Fixed all failing tests under new structure