Removing todos and fixing unit tests
Old factory layers out