Added unit tests and configs