WCDB2: Updated files and Tests