Better separation in switch tests. Also update assignment test description
Cover for and capture blocks.