Properly pass options + add tests