Fixe imports and got tests working