Added some tests for the recent changes