Test&fix

Fix tests