More simple fixes, more passing tests