changes to git ignore, small changes to tests