Updated based on pytest good practices