Updating tests to fit new naming scheme
More changelog entries to the correct place, fix the remaining test