Added+fixed broken tests