incremental checkin, need to get sinon working
updated to include all six exported methods