Fix for issue#310 - Fixed issues with test cases that were failing