Cleaning unit tests and fixed navigation on header