Fixing some brown bags and adding tests