Add more tests and test signatures to be implemented