UPDATE: New unit tests