Increase the tests

Create more tests and fixes.
Include Fixes and New Test

Integrate more tests to validate with Jasmine.