More fixed tests, small fixes to widgets