Added additional tests for TROIA-336 and TROIA-337