Added non-Void contracts for classes previously flagged by AutoTest