Issue 506 fixing test bugs
Issue 506 fixing test bugs