Added a fix for .noConflict(true) not reverting properly. Also added unit tests for...