Port over the unit tests