Fixed one test
Fixed second failing test