Added failing test for issue #660. Some additional passing tests added too