* Better mac addr handling and improve test coverage * Apply suggested changes * Apply more suggested changes