Commented out unused methods, more tests progress.