fixed broken Unit Tests