Cleanup, no need to depend on Bennu

  * Also added Tests