Minor changes
1] Fixed a bug (removed factorial)
2] Added a few more tests