Chris/Chuan - commented out some tests. Found duplicates.