refactored test names and placement in describe blocks