tests added, closes #308, #317