Add more thorough tests

This aims to add a test for each option.