fix on release
Refactor tests