Fixed some tests
Fixed most regression tests