fix test, decouple