Simply testing logic by removing use of char*
Add support for test coverage