Updated refactored tests