Two-side support rework

Reworking of two-sided code from @mauimart
Removed extraneous code from test method