Removing @Ignore/fixing tests and addressing some TODOs
Merge branch 'develop' into br-provide