Added/refactored test