Made final fixes and completed test cases for 1.4