better ports.
small adaptations with the ports.
cleaned things up so that the test works.