Added tests to main branch

Some are broken after the UI rebuild. We'll revisit them when Sidd commits his changes.