Adding some test and keeping some to be implemented other day