Removing @Ignore/fixing tests and addressing some TODOs