tests and fixes...