Updated tests to be more granular