Added testcase for #584
Removed obsolete tests
Renamed test belonging to #578, not #541
Clarified test cases for #541 and #578