edits and updates to get rake tests all working