Added unit test and RFC reference