Made changes to accommodate the packaging of shunit2