Added unit tests and base implementation of decorator