Extra tests, slight change to image rendering. Bug fixes on membership termination (the one that has 8 bug reports for the same error)