Bug fixes: down to 5 tests