Deleted some classes we no longer make use of.
Added failing test for issue #660. Some additional passing tests added too
Merge branch 'develop' into flat-file-export