Remade the test case for a more dynamic testing