chore(enhancments): Add tests and doscs changes