Refactored - Fixed test and added new one