Adds options for  and  nodes. Also adds (brittle) tests.