Some testing works!
Three tests commmented out, but the rest passing!