Fix and add unit test

1 job for master in 2 minutes and 8 seconds