Adding some Unit Tests to control the new feature #114