Add unit testing helper
Add more unit tests