Adding some test features