Adding and updating tests for new changes