Implement Enhancements

How to add new tests