More junits fixes and added for Issue #308