SW Tests 02

I'm still working on these, but I just got hit with a rush job for work, so extra time will be sparse for a couple weeks, but here's what I got so far...