better dependencies, better tests