Fixed Test and removed tests on 2.0-M3