reorganized the cases, created new ones, updated code for more data cases