Fixed tests under new structure