#1578: Fixed abstraction and added test