Fixed Unit Tests + 100% Coverage