Fix layers instanciation
Update for unit tests