Expanded tests, some debugging