Expand tests; fix bugs; introduce others..
More bug-fixing work; more bugs exposed..