Simulation tests added + dummy tests disabled