Fixed a few things to satisfy tests, but there is still a lot to do

Fixed a few things to satisfy tests, but there is still a lot to do #1753