Added test to cover the different entry points