Fixed issue with completed, added testing fixture