FIX: Improving test coverage and old bug