Initial ground work to better support testing
Fix - Remove extra space that object layouts had for values
Tests for Sample 2