Tests arch fix
Merge pull request #53 from bsrao/misc-changes

Tests arch fix