More tests, but some of them failing due to recent changes.
Minor fixes.
Merge remote-tracking branch 'origin/back-end-working' into back-end-working
Merge remote-tracking branch 'origin/master' into back-end-working