Added some tests using the workloads we chose for the old combinations (xls) and it seems ok
Bug fixing and new tests (all passing!)