Replaced some broken functionality, change the tests and add solutions to two functions