Updated tests for various support cases