[#71354110] Refactored addl tests

Signed-off-by: Steven Magelowitz <steven.magelowitz@gmail.com>