Updatings tests still. Committing in preparation for travis integration.