Update test cases using Stubs and apply fixes for new tests