checking in some unfinished stuff and changed tests