Removed dependance on btcec and fixed tests