Fix built in tests