Need to change tests and validate the code