Fix failing tests and added some more