Better Unit Test Cases added. Still need some configuring