Tests

@alexef @iuliachiriac @androane please review