Added unit test and a missing label