Fixed logging, added Rest and EIP tests